|
|
@@ -337,10 +337,10 @@ def clerk_integral_list_api(request):
|
337
|
337
|
return response(SaleclerkStatusCode.CLERK_NOT_FOUND)
|
338
|
338
|
|
339
|
339
|
integrals = SaleclerkIntegralIncomeExpensesInfo.objects.filter(clerk_id=clerk.clerk_id).order_by('-pk')
|
340
|
|
- if ftime and ttime:
|
341
|
|
- fdt = tc.string_to_utc_datetime(ftime)
|
342
|
|
- tdt = tc.string_to_utc_datetime(ttime)
|
343
|
|
- integrals = integrals.filter(created_at__gte=fdt, created_at__lte=tdt)
|
|
340
|
+ if ftime:
|
|
341
|
+ integrals = integrals.filter(created_at__gte=tc.string_to_utc_datetime(ftime))
|
|
342
|
+ if ttime:
|
|
343
|
+ integrals = integrals.filter(created_at__lte=tc.string_to_utc_datetime(ttime))
|
344
|
344
|
integrals, left = pagination(integrals, page, num)
|
345
|
345
|
integrals = [integral.data for integral in integrals]
|
346
|
346
|
|